merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 15 Jul 2011 01:34:17 +0000 (10:34 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 15 Jul 2011 01:34:17 +0000 (10:34 +0900)
commit0be5401a9a632dd2d78bc21a4cc2125756558e11
tree39fbafe6bbcb4e1bb758be5430c1838e2b5d248f
parent8d5e8047ca7561f8df0d3eb06043d19a228014c1
parente6adf225257a8b150bef95a757d1a8ff66acf528
merge trunk